Auto merge of #2771 - alexcrichton:update-replace, r=brson
authorbors <bors@rust-lang.org>
Tue, 7 Jun 2016 23:32:25 +0000 (16:32 -0700)
committerbors <bors@rust-lang.org>
Tue, 7 Jun 2016 23:32:25 +0000 (16:32 -0700)
commit26cb07b2cc0ba0118d15b9df373c9e59cda522ba
tree0f4c76cae75b172cbd1b6338ebf27e028b052b09
parent4fbd47c1a53e75259313c73e519ffb79b3875ee9
parentfeccad0fee6b9c9dc1e3976f6f58f256cc222912
Auto merge of #2771 - alexcrichton:update-replace, r=brson

Don't lock overrides if we're updating them

There was already a function for this, `keep`, it was just forgotten to be
called.

Closes #2766